Properly clear NPCs in NPC tests #30031
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The npc_can_target_player test was sometimes failing due to the hostile NPC choosing to target another NPC instead of the player. This, in turn, was caused by the clearing of NPCs not being done properly. They were unloaded, but then loaded again, and not all were killed. Write a new clear_npcs in map_helpers.h which works more reliably, and call that instead.
jbytheway
added a commit
to jbytheway/Cataclysm-DDA
that referenced
this pull request
Apr 29, 2019
clear_map had a similar flaw to the one fixed in CleverRaven#30031 affecting npc_can_target_player. Fix it in the same way. This wasn't obviously affecting any tests, but it makes sense to fix it pre-emptively.
kevingranade
pushed a commit
that referenced
this pull request
Apr 30, 2019
* Use clear_npcs in clear_map clear_map had a similar flaw to the one fixed in #30031 affecting npc_can_target_player. Fix it in the same way. This wasn't obviously affecting any tests, but it makes sense to fix it pre-emptively. * Before killing npcs, ensure correct ones loaded Some tests (default_overmap_generation_has_non_mandatory_specials_at_origin) overwrite overmaps, which leads to orphaned NPCs. Unloading and reloading the NPCs ensures that all the active NPCs are known to the overmap.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
SUMMARY: None
Purpose of change
The
npc_can_target_playertest was sometimes failing due to the hostile NPC choosing to target another NPC instead of the player.This, in turn, was caused by the clearing of NPCs not being done properly. They were unloaded, but then loaded again, and not all were killed.
Describe the solution
Write a new
clear_npcsinmap_helpers.hwhich works more reliably, and call that instead.Additional context
Not sure why this failure started appearing so much recently, but it's an inter-test dependency so it's always going to be somewhat unpredictable.